Don't reparent back to menu->toplevel if it is already gone because we're

2004-07-15  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmenu.c (gtk_menu_set_tearoff_state): Don't reparent
	back to menu->toplevel if it is already gone because we're
	shutting down.  (#147656, John Cupitt)

diff --git a/ChangeLog b/ChangeLog
index 4405f1fdbd823dfc1c4205865bccd60e5cbd6893..71181775d49d3239c3489c76b11e8831229dcbe5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_set_tearoff_state): Don't reparent
+       back to menu->toplevel if it is already gone because we're
+       shutting down.  (#147656, John Cupitt)
+
 2004-07-14  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #126295:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4405f1fdbd823dfc1c4205865bccd60e5cbd6893..71181775d49d3239c3489c76b11e8831229dcbe5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-07-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_set_tearoff_state): Don't reparent
+       back to menu->toplevel if it is already gone because we're
+       shutting down.  (#147656, John Cupitt)
+
 2004-07-14  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #126295:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4405f1fdbd823dfc1c4205865bccd60e5cbd6893..71181775d49d3239c3489c76b11e8831229dcbe5 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-07-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_set_tearoff_state): Don't reparent
+       back to menu->toplevel if it is already gone because we're
+       shutting down.  (#147656, John Cupitt)
+
 2004-07-14  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #126295:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4405f1fdbd823dfc1c4205865bccd60e5cbd6893..71181775d49d3239c3489c76b11e8831229dcbe5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-07-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_set_tearoff_state): Don't reparent
+       back to menu->toplevel if it is already gone because we're
+       shutting down.  (#147656, John Cupitt)
+
 2004-07-14  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #126295:

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index a38adbc974425c770125bd4dea766d73794de21e..0dd1f9f7aae0cf10b4e773d4c4693b595777e522 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1861,7 +1861,8 @@ gtk_menu_set_tearoff_state (GtkMenu  *menu,
        {
          gtk_widget_hide (GTK_WIDGET (menu));
          gtk_widget_hide (menu->tearoff_window);
-         gtk_menu_reparent (menu, menu->toplevel, FALSE);
+         if (GTK_IS_CONTAINER (menu->toplevel))
+           gtk_menu_reparent (menu, menu->toplevel, FALSE);
          gtk_widget_destroy (menu->tearoff_window);
          
          menu->tearoff_window = NULL;